diff --git a/common/default.nix b/common/default.nix
index 4e5ee2a..4853991 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }: {
-  imports = [ ../users ];
+  imports = [ ./users ];
 
   boot.cleanTmpDir = true;
   boot.kernelModules = [ "wireguard" ];
diff --git a/users/default.nix b/common/users/default.nix
similarity index 95%
rename from users/default.nix
rename to common/users/default.nix
index d7e90ad..7b9a090 100644
--- a/users/default.nix
+++ b/common/users/default.nix
@@ -2,9 +2,7 @@
 
 with lib;
 
-let cfg = config.within.users.mkOthers "Make users other than cadey";
-
-in {
+{
   users.users.cadey = {
     isNormalUser = true;
     extraGroups =
@@ -29,4 +27,5 @@ in {
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4mrGB2aTjHkp3r3Q7l8FHgtDPCCDqBUp9DykRWjcMA mara@blink"
     ];
   };
+  users.users.root.openssh.authorizedKeys.keys = config.users.users.cadey.openssh.authorizedKeys.keys;
 }
diff --git a/flake.nix b/flake.nix
index edb8ceb..29521ad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
 
       nixosConfigurations.logos = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [ ./hosts/logos ];
+        modules = [ ./hosts/logos ./hardware/alrest ];
       };
 
       deploy.nodes.some-random-system.profiles.system = {
diff --git a/hardware/alrest/default.nix b/hardware/alrest/default.nix
index 7227f9b..c9e653b 100644
--- a/hardware/alrest/default.nix
+++ b/hardware/alrest/default.nix
@@ -2,11 +2,7 @@
 
 let metadata = pkgs.callPackage ../../../ops/metadata/peers.nix { };
 in {
-  imports = [
-    ./hardware-configuration.nix
-    ./solanum.nix
-    ./zfs.nix
-  ];
+  imports = [ ./hardware-configuration.nix ./zfs.nix ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -33,10 +29,10 @@ in {
   services.zfs.autoSnapshot.enable = true;
   services.zfs.trim.enable = true;
 
-  cadey.cpu = {
-    enable = true;
-    vendor = "intel";
-  };
+  # cadey.cpu = {
+  #   enable = true;
+  #   vendor = "intel";
+  # };
 
   security.sudo.wheelNeedsPassword = false;
 
diff --git a/hosts/logos/default.nix b/hosts/logos/default.nix
index 4189605..2bac608 100755
--- a/hosts/logos/default.nix
+++ b/hosts/logos/default.nix
@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  imports = [ ../../common ];
+
   users.motd = builtins.readFile ./motd;
 
   networking.hostName = "logos";