diff --git a/common/default.nix b/common/default.nix
index fadb249..70b097b 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -2,6 +2,7 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./users
+    ./modules
   ];
 
   home-manager = {
diff --git a/nixos/common/generic-vm.nix b/common/generic-vm.nix
similarity index 53%
rename from nixos/common/generic-vm.nix
rename to common/generic-vm.nix
index 086bf63..739762f 100644
--- a/nixos/common/generic-vm.nix
+++ b/common/generic-vm.nix
@@ -1,5 +1,5 @@
-_: {
-  networking.useDHCP = true;
+{ lib, ... }: {
+  networking.useDHCP = lib.mkDefault true;
 
   # Enable qemu guest agent
   services.qemuGuest.enable = true;
diff --git a/nixos/common/modules/default.nix b/common/modules/default.nix
similarity index 100%
rename from nixos/common/modules/default.nix
rename to common/modules/default.nix
diff --git a/nixos/common/modules/dns.nix b/common/modules/dns.nix
similarity index 100%
rename from nixos/common/modules/dns.nix
rename to common/modules/dns.nix
diff --git a/nixos/common/modules/flood.nix b/common/modules/flood.nix
similarity index 100%
rename from nixos/common/modules/flood.nix
rename to common/modules/flood.nix
diff --git a/nixos/common/modules/gnome/default.nix b/common/modules/gnome/default.nix
similarity index 100%
rename from nixos/common/modules/gnome/default.nix
rename to common/modules/gnome/default.nix
diff --git a/nixos/common/modules/gnome/hm.nix b/common/modules/gnome/hm.nix
similarity index 100%
rename from nixos/common/modules/gnome/hm.nix
rename to common/modules/gnome/hm.nix
diff --git a/nixos/common/modules/meta.nix b/common/modules/meta.nix
similarity index 100%
rename from nixos/common/modules/meta.nix
rename to common/modules/meta.nix
diff --git a/nixos/common/modules/nginx.nix b/common/modules/nginx.nix
similarity index 100%
rename from nixos/common/modules/nginx.nix
rename to common/modules/nginx.nix
diff --git a/nixos/common/modules/unpackerr.nix b/common/modules/unpackerr.nix
similarity index 100%
rename from nixos/common/modules/unpackerr.nix
rename to common/modules/unpackerr.nix
diff --git a/nixos/common/modules/vault.nix b/common/modules/vault.nix
similarity index 100%
rename from nixos/common/modules/vault.nix
rename to common/modules/vault.nix
diff --git a/flake.nix b/flake.nix
index b28b77e..386a4e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,7 +83,7 @@
       nixosConfigurations."bastion.olympus" = lib.nixosSystem {
         inherit system pkgs;
         specialArgs = { inherit inputs; };
-        modules = [ ./common ./hosts/olympus/bastion ];
+        modules = [ ./common ./common/generic-vm.nix ./hosts/olympus/bastion ];
       };
 
       deploy = {