diff --git a/config/programs/ssh.nix b/config/programs/ssh.nix
index 61aea731..e03815e7 100644
--- a/config/programs/ssh.nix
+++ b/config/programs/ssh.nix
@@ -1,19 +1,21 @@
 { ... }: {
   programs.ssh = {
     enable = true;
-    "build-nas" = {
-      hostname = "backup.int.chir.rs";
-      identitiesOnly = true;
-      identityFile = "~/.ssh/id_ed25519";
-      port = 22;
-      user = "darkkirb";
-    };
-    "build-pc" = {
-      hostname = "nutty-noon.int.chir.rs";
-      identitiesOnly = true;
-      identityFile = "~/.ssh/id_ed25519";
-      port = 22;
-      user = "darkkirb";
+    matchBlocks = {
+      "build-nas" = {
+        hostname = "backup.int.chir.rs";
+        identitiesOnly = true;
+        identityFile = "~/.ssh/id_ed25519";
+        port = 22;
+        user = "darkkirb";
+      };
+      "build-pc" = {
+        hostname = "nutty-noon.int.chir.rs";
+        identitiesOnly = true;
+        identityFile = "~/.ssh/id_ed25519";
+        port = 22;
+        user = "darkkirb";
+      };
     };
   };
 }