diff --git a/machines/desko/default.nix b/machines/desko/default.nix
index 83797586..d71e0ab9 100644
--- a/machines/desko/default.nix
+++ b/machines/desko/default.nix
@@ -1,7 +1,6 @@
 { pkgs, config, lib, ... }:
 {
   imports = [
-    ./../../helpers/universal
     ./fs.nix
   ];
 
diff --git a/machines/lappy/default.nix b/machines/lappy/default.nix
index 49cff901..b29b73a1 100644
--- a/machines/lappy/default.nix
+++ b/machines/lappy/default.nix
@@ -1,7 +1,6 @@
 { pkgs, config, lib, ... }:
 {
   imports = [
-    ./../../helpers/universal
     ./fs.nix
   ];
 
diff --git a/machines/moby/default.nix b/machines/moby/default.nix
index 7fe82ab8..92a00041 100644
--- a/machines/moby/default.nix
+++ b/machines/moby/default.nix
@@ -1,11 +1,5 @@
 { pkgs, config, lib, ... }:
 {
-  imports = [
-    ./../../helpers/universal
-    # ./../../helpers/gui/plasma-mobile.nix
-    # ./../../helpers/gui/gnome.nix
-  ];
-
   # XXX colin: phosh doesn't work well with passwordless login
   users.users.colin.initialPassword = "147147";
 
diff --git a/machines/uninsane/default.nix b/machines/uninsane/default.nix
index b7a83c11..12389865 100644
--- a/machines/uninsane/default.nix
+++ b/machines/uninsane/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./../../helpers/universal
     ./fs.nix
     ./hardware.nix
     ./net.nix
diff --git a/modules/default.nix b/modules/default.nix
index f193b5d6..38203cf9 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,5 +4,6 @@
   imports = [
     ./gui
     ./hardware
+    ./universal
   ];
 }
diff --git a/helpers/universal/default.nix b/modules/universal/default.nix
similarity index 100%
rename from helpers/universal/default.nix
rename to modules/universal/default.nix
diff --git a/helpers/universal/fs.nix b/modules/universal/fs.nix
similarity index 100%
rename from helpers/universal/fs.nix
rename to modules/universal/fs.nix
diff --git a/helpers/universal/home-manager.nix b/modules/universal/home-manager.nix
similarity index 100%
rename from helpers/universal/home-manager.nix
rename to modules/universal/home-manager.nix
diff --git a/helpers/universal/nix-cache.nix b/modules/universal/nix-cache.nix
similarity index 100%
rename from helpers/universal/nix-cache.nix
rename to modules/universal/nix-cache.nix
diff --git a/helpers/universal/secrets.nix b/modules/universal/secrets.nix
similarity index 100%
rename from helpers/universal/secrets.nix
rename to modules/universal/secrets.nix
diff --git a/helpers/universal/users.nix b/modules/universal/users.nix
similarity index 100%
rename from helpers/universal/users.nix
rename to modules/universal/users.nix