diff --git a/hosts/nixos/lapetus/default.nix b/hosts/nixos/lapetus/default.nix
index 7024156..affb81d 100644
--- a/hosts/nixos/lapetus/default.nix
+++ b/hosts/nixos/lapetus/default.nix
@@ -19,7 +19,6 @@ in
   networking.hostName = "lapetus";
 
   # ID required by zfs.
-  # Generated with `head -c 8 /etc/machine-id`.
   networking.hostId = "08357db3";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
@@ -29,6 +28,7 @@ in
   boot.supportedFilesystems = [ "zfs" ];
   boot.zfs.extraPools = [ "zroot" ];
   boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  boot.kernelParams = [ "nohibernate" ];
 
   # We use non-legacy mountpoints
   # See [this wiki link](https://nixos.wiki/wiki/ZFS)
@@ -49,17 +49,10 @@ in
       "/persist/data" = zfs;
       "/persist/state" = zfs;
       "/persist/local/cache" = zfs;
-      "/boot" = {
-        neededForBoot = true;
-        options = [ "zfsutil" "X-mount.mkdir" ];
-      };
+      "/boot".neededForBoot = true;
     };
   # }}}
 
   # Boot
-  boot.loader.grub = {
-    inherit device;
-    enable = true;
-    version = 2;
-  };
+  boot.loader.systemd-boot.enable = true;
 }
diff --git a/hosts/nixos/lapetus/partitions.nix b/hosts/nixos/lapetus/partitions.nix
index 846fa17..c64bd0e 100644
--- a/hosts/nixos/lapetus/partitions.nix
+++ b/hosts/nixos/lapetus/partitions.nix
@@ -11,20 +11,19 @@
           partitions = [
             {
               name = "ESP";
-              start = "1MiB";
-              end = "100MiB";
+              start = "0MiB";
+              end = "128Mib";
               bootable = true;
               content = {
                 type = "filesystem";
-                format = "vfat";
+                format = "fat32";
                 mountpoint = "/boot";
-                mountOptions = [ "defaults" ];
               };
             }
             {
-              start = "100MiB";
+              name = "zfs";
+              start = "128MiB";
               end = "100%";
-              name = "primary";
               content = {
                 type = "zfs";
                 pool = "zroot";