diff --git a/users/qenya.nix b/common/users/qenya.nix
similarity index 79%
rename from users/qenya.nix
rename to common/users/qenya.nix
index 0dadb30..74062f7 100644
--- a/users/qenya.nix
+++ b/common/users/qenya.nix
@@ -1,5 +1,7 @@
 { config, lib, pkgs, ... }:
 
+let keys = import ../../keys.nix;
+in
 {
   users.users.qenya = {
     isNormalUser = true;
@@ -9,9 +11,7 @@
       "networkmanager" # UI wifi configuration
       "dialout" # access to serial ports
     ];
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru"
-    ];
+    openssh.authorizedKeys.keys = keys.users.qenya;
     uid = 1001;
   };
 
diff --git a/hive.nix b/hive.nix
index 5fa0e76..685237e 100644
--- a/hive.nix
+++ b/hive.nix
@@ -27,7 +27,7 @@ in {
       ./common/ssh.nix
       ./common/sudo.nix
       ./common/utilities.nix
-      ./users/qenya.nix
+      ./common/users/qenya.nix
     ];
   };
 
diff --git a/keys.nix b/keys.nix
new file mode 100644
index 0000000..57138d7
--- /dev/null
+++ b/keys.nix
@@ -0,0 +1,13 @@
+{
+  machines = {
+    tohru = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8wuGzF0Y7SaH9aimo3SmCz99MTQwL+rEVhx0jsueU root@tohru";
+    yevaud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHUAgyQhl390yUObLUI+jEbuNrZ2U6+8px628DolD+T root@yevaud";
+    orm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGc9rkcdOVWozBFj3kLVnSyUQQbyyH+UG+bLawanQkRQ root@orm";
+  };
+
+  users = {
+    qenya = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru"
+    ];
+  };
+}
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index a4a270a..c41523b 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,6 +1,4 @@
 let
-  tohru = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8wuGzF0Y7SaH9aimo3SmCz99MTQwL+rEVhx0jsueU root@tohru";
-  yevaud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHUAgyQhl390yUObLUI+jEbuNrZ2U6+8px628DolD+T root@yevaud";
-  systems = [ tohru yevaud ];
+  keys = ../ssh-keys.nix;
 in
 { }