diff --git a/modules/home/programs/terminal/ssh/default.nix b/modules/home/programs/terminal/ssh/default.nix
index 59bf3077..fbcfc3e1 100644
--- a/modules/home/programs/terminal/ssh/default.nix
+++ b/modules/home/programs/terminal/ssh/default.nix
@@ -5,8 +5,9 @@
     addKeysToAgent = "yes";
     compression = true;
     matchBlocks = with lib.hm.dag; {
+      # Personal servers
       nixfox = {
-        host = "*.nixfox.ca";
+        match = ''canonical host "*.nixfox.ca"'';
         user = config.home.username;
       };
       midas = entryAfter [ "nixfox" ] {
@@ -19,6 +20,12 @@
       prophet = entryAfter [ "nixfox" ] {
         hostname = "mx.nixfox.ca";
       };
+
+      # Misc
+      seneca = {
+        hostname = "matrix.senecapolytechnic.ca";
+        user = "jhampton1";
+      };
     };
   };
 }
diff --git a/modules/home/settings/aliases/default.nix b/modules/home/settings/aliases/default.nix
index ea6336c7..e4d5ff4d 100644
--- a/modules/home/settings/aliases/default.nix
+++ b/modules/home/settings/aliases/default.nix
@@ -7,6 +7,5 @@
 
     # Shortcuts
     myip = "curl ifconfig.co";
-    seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";
   };
 }