diff --git a/hosts/hyp-01/modules/boot.nix b/hosts/hyp-01/modules/boot.nix
index fa3aaf9..a4caca0 100644
--- a/hosts/hyp-01/modules/boot.nix
+++ b/hosts/hyp-01/modules/boot.nix
@@ -3,6 +3,5 @@
   boot.loader.systemd-boot.enable = false;
   boot.loader.grub = {
     enable = true;
-    efiSupport = false;
   };
 }
diff --git a/hosts/hyp-01/modules/disko.nix b/hosts/hyp-01/modules/disko.nix
index 525e047..b0c9455 100644
--- a/hosts/hyp-01/modules/disko.nix
+++ b/hosts/hyp-01/modules/disko.nix
@@ -126,8 +126,14 @@ in
 
   boot.loader.grub = {
     device = disk1;
-
+    version = 2;
+    zfsSupport = true;
+    efiSupport = true;
     mirroredBoots = [
+      {
+        devices = [ disk1 ];
+        path = "/boot";
+      }
       {
         devices = [ disk2 ];
         path = "/boot-fallback";
diff --git a/hosts/hyp-01/modules/impermanence.nix b/hosts/hyp-01/modules/impermanence.nix
index 2d50d54..360f306 100644
--- a/hosts/hyp-01/modules/impermanence.nix
+++ b/hosts/hyp-01/modules/impermanence.nix
@@ -1,7 +1,6 @@
 { lib, ... }:
 {
   boot.initrd.systemd.enable = true;
-  boot.initrd.postDeviceCommands = lib.mkAfter "zfs mount -a";
 
   fileSystems."/" = {
     device = "none";
@@ -13,6 +12,8 @@
     ];
   };
 
+  fileSystems."/persist".neededForBoot = true;
+
   environment.persistence."/persist" = {
     directories = [
       "/etc/nixos"
diff --git a/hosts/hyp-01/modules/networking.nix b/hosts/hyp-01/modules/networking.nix
index f238490..2f203b2 100644
--- a/hosts/hyp-01/modules/networking.nix
+++ b/hosts/hyp-01/modules/networking.nix
@@ -41,7 +41,7 @@
     systemd.network.networks."10-uplink".networkConfig.Address = config.networking.hyp-01.ipv6.address;
 
     boot.initrd.systemd.network.enable = true;
-    boot.initrd.systemd.network.networks."10-uplink" = config.systemd.networks."10-uplink";
+    boot.initrd.systemd.network.networks."10-uplink" = config.systemd.network.networks."10-uplink";
 
     boot.initrd.network = {
       enable = true;
@@ -52,6 +52,9 @@
         authorizedKeys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnthKtz0fE4yQ/X10cJgKVCjYCNkRNoqV28xAhD7h2M cardno:22_498_026"
         ];
+        hostKeys = [
+          "/etc/secrets/initrd/ssh_host_ed25519_key"
+        ];
       };
     };
 
diff --git a/hosts/hyp-01/modules/users.nix b/hosts/hyp-01/modules/users.nix
index ac65bda..5a142c6 100644
--- a/hosts/hyp-01/modules/users.nix
+++ b/hosts/hyp-01/modules/users.nix
@@ -17,4 +17,6 @@ in
     ];
     openssh.authorizedKeys.keys = [ sshKey ];
   };
+
+  programs.zsh.enable = true;
 }