diff --git a/modules/home.nix b/modules/home.nix
index 619ef02..be5b245 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -12,6 +12,7 @@ let
     ./home/zed.nix
     ./home/ghostty.nix
     ./home/syncthing.nix
+    ./home/ssh.nix
   ];
 in
 {
diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix
index f1fe35d..692b3d7 100644
--- a/modules/home/ssh.nix
+++ b/modules/home/ssh.nix
@@ -2,22 +2,23 @@
 
 {
   programs.ssh = {
-      enable = true;
-      extraConfig = "
-        Host localhost
-            UserKnownHostsFile /dev/null
-
-        Host tux
-            HostName tuxworld.usask.ca
-            User atl175
-
-        Host haschel
-            HostName haschel
-            User fedora
-
-        Host lloyd
-            HostName lloyd
-            User truenas_admin
-      ";
+    enable = true;
+    matchBlocks = {
+      "localhost" = {
+        extraOptions.UserKnownHostsFile = "/dev/null";
+      };
+      "tux" = {
+        hostname = "tuxworld.usask.ca";
+        user = "atl175";
+      };
+      "haschel" = {
+        hostname = "haschel";
+        user = "fedora";
+      };
+      "lloyd" = {
+        hostname = "lloyd";
+        user = "truenas_admin";
+      };
+    };
   };
 }