diff --git a/modules/home/all/ssh.nix b/modules/home/all/ssh.nix
index cab1d9f..daa487e 100644
--- a/modules/home/all/ssh.nix
+++ b/modules/home/all/ssh.nix
@@ -3,8 +3,6 @@
   programs.ssh = {
     enable = true;
 
-    addKeysToAgent = "yes";
-
     includes = [
       "~/.orbstack/ssh/config" # https://docs.orbstack.dev/machines/ssh
     ];
@@ -12,6 +10,7 @@
     # Note: More defined in juspay.nix
     matchBlocks = {
       "*" = {
+        addKeysToAgent = "yes";
         setEnv = {
           # https://ghostty.org/docs/help/terminfo#configure-ssh-to-fall-back-to-a-known-terminfo-entry
           TERM = "xterm-256color";
diff --git a/modules/nixos/shared/nix.nix b/modules/nixos/shared/nix.nix
index d4d2f49..0dd429f 100644
--- a/modules/nixos/shared/nix.nix
+++ b/modules/nixos/shared/nix.nix
@@ -30,7 +30,7 @@ in
       # I don't have an Intel mac.
       extra-platforms = lib.mkIf pkgs.stdenv.isDarwin "aarch64-darwin x86_64-darwin";
       # Nullify the registry for purity.
-      flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}'';
+      flake-registry = pkgs.writeText "empty-flake-registry.json" ''{"flakes":[],"version":2}'';
       trusted-users = [ "root" (if pkgs.stdenv.isDarwin then flake.config.me.username else "@wheel") ];
     };
   };