diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix
index 0042342..692b3d7 100644
--- a/modules/home/ssh.nix
+++ b/modules/home/ssh.nix
@@ -1,19 +1,24 @@
-programs.ssh = {
+{ settings, ... }:
+
+{
+  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
-    ";
-};
+    matchBlocks = {
+      "localhost" = {
+        extraOptions.UserKnownHostsFile = "/dev/null";
+      };
+      "tux" = {
+        hostname = "tuxworld.usask.ca";
+        user = "atl175";
+      };
+      "haschel" = {
+        hostname = "haschel";
+        user = "fedora";
+      };
+      "lloyd" = {
+        hostname = "lloyd";
+        user = "truenas_admin";
+      };
+    };
+  };
+}