diff --git a/system/modules/sops-nix/default.nix b/system/modules/sops-nix/default.nix
index 37c07cc9..ee0de66a 100644
--- a/system/modules/sops-nix/default.nix
+++ b/system/modules/sops-nix/default.nix
@@ -14,7 +14,7 @@ in {
     environment.systemPackages = with pkgs; [
       sops
       age
-      ssh-to-age
+      # ssh-to-age
     ];
 
     environment.variables = {
@@ -32,11 +32,33 @@ in {
       };
 
       secrets = let
-        mkSecret = name: {${name} = {};};
+        mkSecret = name: {
+          ${name} = {
+            owner = config.users.users.${username}.name;
+            group = config.users.users.${username}.group;
+          };
+        };
+
+        mkBootSecret = name: {
+          ${name} = {
+            # Make these secrets available before creating users.
+            # This means we can't set the owner or group.
+            neededForUsers = true;
+          };
+        };
       in
-        if (builtins.hasAttr "${username}" sops-nix.secrets)
-        then lib.mergeAttrsList (builtins.map mkSecret sops-nix.secrets.${username})
-        else {};
+        lib.mkMerge [
+          (
+            if (builtins.hasAttr "${username}" sops-nix.secrets)
+            then lib.mergeAttrsList (builtins.map mkSecret sops-nix.secrets.${username})
+            else {}
+          )
+          (
+            if (builtins.hasAttr "${username}" sops-nix.bootSecrets)
+            then lib.mergeAttrsList (builtins.map mkBootSecret sops-nix.bootSecrets.${username})
+            else {}
+          )
+        ];
     };
   };
 }
diff --git a/system/modules/sops-nix/options.nix b/system/modules/sops-nix/options.nix
index c197217c..2aaa8551 100644
--- a/system/modules/sops-nix/options.nix
+++ b/system/modules/sops-nix/options.nix
@@ -13,4 +13,15 @@
     '';
     default = [];
   };
+
+  bootSecrets = lib.mkOption {
+    type = lib.types.attrsOf (lib.types.listOf lib.types.str);
+    description = "The secrets to expose on this host earlier in the boot process";
+    example = ''
+      christoph = [
+        "user-password"
+      ];
+    '';
+    default = [];
+  };
 }