diff --git a/systems/PC-Fixe/configuration.nix b/systems/PC-Fixe/configuration.nix
index 76a6531..3b15ac1 100644
--- a/systems/PC-Fixe/configuration.nix
+++ b/systems/PC-Fixe/configuration.nix
@@ -12,11 +12,15 @@
       ../common-gui.nix
     ];
 
-  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.systemd-boot.memtest86.enable = true;
+  boot.loader.grub = {
+    efiSupport = true;
+    device = "nodev";
+    zfsSupport = true;
+  };
   boot.kernelParams = ["acpi_enforce_resources=lax"];
   boot.tmpOnTmpfs = true;
+  boot.supportedFilesystems = [ "zfs" ];
 
   hardware.bluetooth.enable = true;
 
@@ -36,6 +40,7 @@
   security.pki.certificateFiles = [ ./codemasters.pem ];
 
   networking.hostName = "paul-fixe";
+  networking.hostId = "3a1f739e";
 
   environment.systemPackages = with pkgs; [
     usb_modeswitch
@@ -76,5 +81,5 @@
   services.openssh.enable = true;
   services.openssh.passwordAuthentication = false;
 
-  system.stateVersion = "18.09";
+  system.stateVersion = "20.03";
 }
diff --git a/systems/PC-Fixe/hardware-configuration.nix b/systems/PC-Fixe/hardware-configuration.nix
index 724c6de..4c1ba89 100644
--- a/systems/PC-Fixe/hardware-configuration.nix
+++ b/systems/PC-Fixe/hardware-configuration.nix
@@ -8,7 +8,8 @@
     [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "firewire_ohci" "pata_marvell" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "nvme" "firewire_ohci" "pata_marvell" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" "nct6775" ];
   boot.extraModulePackages = [ ];
 
@@ -17,12 +18,17 @@
   hardware.cpu.intel.updateMicrocode = true;
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/509a5842-56fe-40bd-8b00-6bda87e02e5e";
-      fsType = "ext4";
+    { device = "rpool/root/nixos";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home" =
+    { device = "rpool/home";
+      fsType = "zfs";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/A225-07A5";
+    { device = "/dev/disk/by-uuid/F4EC-57DF";
       fsType = "vfat";
     };