diff --git a/nix/hosts/doloro-wsl/home.nix b/nix/hosts/doloro-wsl/home.nix
index 1cd2e4e..50808d4 100644
--- a/nix/hosts/doloro-wsl/home.nix
+++ b/nix/hosts/doloro-wsl/home.nix
@@ -106,7 +106,13 @@
   programs = {
     home-manager.enable = true;
     ssh = {
-      matchBlocks."*".addKeysToAgent = "yes";
+      enable = true;
+      enableDefaultConfig = false;
+      matchBlocks = {
+        "*" = {
+          addKeysToAgent = "yes";
+        };
+      };
     };
   };
 }
diff --git a/nix/hosts/doloro/home.nix b/nix/hosts/doloro/home.nix
index 7ecc15a..d7b68c0 100644
--- a/nix/hosts/doloro/home.nix
+++ b/nix/hosts/doloro/home.nix
@@ -119,9 +119,16 @@
   };
   xdg.configFile."mimeapps.list".force = true;
   # Let Home Manager install and manage itself.
+
   programs = {
     ssh = {
-      matchBlocks."*".addKeysToAgent = "yes";
+      enable = true;
+      enableDefaultConfig = false;
+      matchBlocks = {
+        "*" = {
+          addKeysToAgent = "yes";
+        };
+      };
     };
     home-manager.enable = true;
   };