diff --git a/users/richie/systems/rhapsody-in-green/configuration.nix b/systems/rhapsody-in-green/configuration.nix
similarity index 97%
rename from users/richie/systems/rhapsody-in-green/configuration.nix
rename to systems/rhapsody-in-green/configuration.nix
index 142255c..dac1507 100644
--- a/users/richie/systems/rhapsody-in-green/configuration.nix
+++ b/systems/rhapsody-in-green/configuration.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ./hardware.nix
-    ../../syncthing_base.nix
+    ../../users/richie/syncthing_base.nix
   ];
 
   boot = {
diff --git a/users/richie/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix
similarity index 83%
rename from users/richie/systems/rhapsody-in-green/default.nix
rename to systems/rhapsody-in-green/default.nix
index 5206a0b..4158e4a 100644
--- a/users/richie/systems/rhapsody-in-green/default.nix
+++ b/systems/rhapsody-in-green/default.nix
@@ -1,5 +1,8 @@
 { inputs, ... }:
 {
+  users = [
+    "richie"
+  ];
   system = "x86_64-linux";
   home = true;
   sops = true;
diff --git a/users/richie/systems/rhapsody-in-green/hardware.nix b/systems/rhapsody-in-green/hardware.nix
similarity index 100%
rename from users/richie/systems/rhapsody-in-green/hardware.nix
rename to systems/rhapsody-in-green/hardware.nix
diff --git a/users/richie/home.nix b/users/richie/home.nix
index d9a24ab..e54b39e 100644
--- a/users/richie/home.nix
+++ b/users/richie/home.nix
@@ -6,11 +6,7 @@
     ./home/vscode
   ];
 
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-    };
-  };
+  nixpkgs.config.allowUnfree = true;
 
   home = {
     username = "richie";