diff --git a/devices/binto/default.nix b/devices/binto/default.nix
index 02def669..597a3fde 100644
--- a/devices/binto/default.nix
+++ b/devices/binto/default.nix
@@ -36,11 +36,6 @@ in {
       "video"
       "libvirtd"
     ];
-
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE39uk52+NIDLdHeoSHIEsOUUFRzj06AGn09z4TUOYm matt@OP9"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGbLu+Gb7PiyNgNXMHemaQLnKixebx1/4cdJGna9OQp matt@wim"
-    ];
   };
   home-manager.users.${mainUser} = {
     imports = [
diff --git a/devices/oksys/default.nix b/devices/oksys/default.nix
index 60280c9d..5bd8833a 100644
--- a/devices/oksys/default.nix
+++ b/devices/oksys/default.nix
@@ -26,12 +26,6 @@ in {
       "wheel"
       "adm"
     ];
-
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE39uk52+NIDLdHeoSHIEsOUUFRzj06AGn09z4TUOYm matt@OP9"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICr2+CpqXNMLsjgbrYyIwTKhlVSiIYol1ghBPzLmUpKl matt@binto"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGbLu+Gb7PiyNgNXMHemaQLnKixebx1/4cdJGna9OQp matt@wim"
-    ];
   };
   home-manager.users.${mainUser} = {
     imports = [];
diff --git a/devices/servivi/default.nix b/devices/servivi/default.nix
index 67ebdf72..2b36a4e8 100644
--- a/devices/servivi/default.nix
+++ b/devices/servivi/default.nix
@@ -26,12 +26,6 @@ in {
         "wheel"
         "adm"
       ];
-
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE39uk52+NIDLdHeoSHIEsOUUFRzj06AGn09z4TUOYm matt@OP9"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICr2+CpqXNMLsjgbrYyIwTKhlVSiIYol1ghBPzLmUpKl matt@binto"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGbLu+Gb7PiyNgNXMHemaQLnKixebx1/4cdJGna9OQp matt@wim"
-      ];
     };
 
     # https://nixos.wiki/wiki/Distributed_build
diff --git a/flake.nix b/flake.nix
index 4fdb783c..8ae0ab99 100644
--- a/flake.nix
+++ b/flake.nix
@@ -191,6 +191,7 @@
       owner = "horriblename";
       repo = "hyprgrass";
 
+      # FIXME: https://github.com/horriblename/hyprgrass/issues/76
       # Commit before PR #73 that breaks swiping
       rev = "0165a9ed8679f3f2c62cc868bdaf620e4520d504";
 
diff --git a/modules/sshd.nix b/modules/sshd.nix
index f4714c5a..e0334fc2 100644
--- a/modules/sshd.nix
+++ b/modules/sshd.nix
@@ -1,4 +1,6 @@
-{...}: {
+{config, ...}: let
+  inherit (config.vars) mainUser;
+in {
   services = {
     openssh = {
       enable = true;
@@ -8,4 +10,12 @@
       };
     };
   };
+
+  users.users.${mainUser} = {
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE39uk52+NIDLdHeoSHIEsOUUFRzj06AGn09z4TUOYm matt@OP9"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICr2+CpqXNMLsjgbrYyIwTKhlVSiIYol1ghBPzLmUpKl matt@binto"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGbLu+Gb7PiyNgNXMHemaQLnKixebx1/4cdJGna9OQp matt@wim"
+    ];
+  };
 }