diff --git a/flake.nix b/flake.nix
index f01d6d2..72558e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,11 +32,7 @@
       system = "x86_64-linux";
 
       commonModules = hostname: [
-        ./modules/system
-        ./modules/sops.nix
-        ./modules/gnome.nix
-        ./modules/syncthing
-        ./modules/stylix.nix
+        ./hosts/common
         ./hosts/${hostname}
 
         sops-nix.nixosModules.sops
diff --git a/modules/gnome.nix b/hosts/common/gnome.nix
similarity index 96%
rename from modules/gnome.nix
rename to hosts/common/gnome.nix
index 1b565c3..4484731 100644
--- a/modules/gnome.nix
+++ b/hosts/common/gnome.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   config = {
diff --git a/modules/sops.nix b/hosts/common/sops.nix
similarity index 100%
rename from modules/sops.nix
rename to hosts/common/sops.nix
diff --git a/modules/stylix.nix b/hosts/common/stylix.nix
similarity index 100%
rename from modules/stylix.nix
rename to hosts/common/stylix.nix
diff --git a/modules/syncthing/default.nix b/hosts/common/syncthing/default.nix
similarity index 100%
rename from modules/syncthing/default.nix
rename to hosts/common/syncthing/default.nix
diff --git a/modules/syncthing/devices.nix b/hosts/common/syncthing/devices.nix
similarity index 100%
rename from modules/syncthing/devices.nix
rename to hosts/common/syncthing/devices.nix
diff --git a/modules/system/audio.nix b/hosts/common/system/audio.nix
similarity index 100%
rename from modules/system/audio.nix
rename to hosts/common/system/audio.nix
diff --git a/modules/system/boot.nix b/hosts/common/system/boot.nix
similarity index 100%
rename from modules/system/boot.nix
rename to hosts/common/system/boot.nix
diff --git a/modules/system/core.nix b/hosts/common/system/core.nix
similarity index 100%
rename from modules/system/core.nix
rename to hosts/common/system/core.nix
diff --git a/modules/system/default.nix b/hosts/common/system/default.nix
similarity index 100%
rename from modules/system/default.nix
rename to hosts/common/system/default.nix
diff --git a/modules/system/locale.nix b/hosts/common/system/locale.nix
similarity index 100%
rename from modules/system/locale.nix
rename to hosts/common/system/locale.nix
diff --git a/modules/system/misc.nix b/hosts/common/system/misc.nix
similarity index 100%
rename from modules/system/misc.nix
rename to hosts/common/system/misc.nix
diff --git a/modules/system/nh.nix b/hosts/common/system/nh.nix
similarity index 100%
rename from modules/system/nh.nix
rename to hosts/common/system/nh.nix
diff --git a/modules/system/packages.nix b/hosts/common/system/packages.nix
similarity index 100%
rename from modules/system/packages.nix
rename to hosts/common/system/packages.nix
diff --git a/modules/system/printing.nix b/hosts/common/system/printing.nix
similarity index 100%
rename from modules/system/printing.nix
rename to hosts/common/system/printing.nix