diff --git a/modules/common/default.nix b/modules/common/default.nix
index ad3727e..5116b82 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     (import "${inputs.self}/modules/cli" { inherit inputs pkgs system; })
-    (import "${inputs.self}/modules/tmux" { inherit inputs pkgs system; })
   ];
 
   # The rough location
diff --git a/systems/desktop-vm/default.nix b/systems/desktop-vm/default.nix
index ee3048b..774c3eb 100644
--- a/systems/desktop-vm/default.nix
+++ b/systems/desktop-vm/default.nix
@@ -6,6 +6,7 @@
     "${inputs.self}/modules/docker"
     "${inputs.self}/modules/espanso"
     "${inputs.self}/modules/nix-direnv"
+    "${inputs.self}/modules/tmux"
   ];
   boot.initrd.availableKernelModules = [
     "ata_piix"
diff --git a/systems/gwyn/default.nix b/systems/gwyn/default.nix
index 1890c2c..7f1cab6 100644
--- a/systems/gwyn/default.nix
+++ b/systems/gwyn/default.nix
@@ -15,6 +15,7 @@
     "${inputs.self}/modules/nix-direnv"
     "${inputs.self}/modules/restic"
     "${inputs.self}/modules/tlp"
+    "${inputs.self}/modules/tmux"
   ];
   boot.initrd.availableKernelModules = [
     "aesni_intel"
diff --git a/systems/nixos-management/default.nix b/systems/nixos-management/default.nix
index dfbd27f..94c7794 100644
--- a/systems/nixos-management/default.nix
+++ b/systems/nixos-management/default.nix
@@ -12,5 +12,6 @@
     "${inputs.self}/modules/code-server"
     "${inputs.self}/modules/docker"
     "${inputs.self}/modules/nix-direnv"
+    "${inputs.self}/modules/tmux"
   ];
 }
diff --git a/systems/raspi-test/default.nix b/systems/raspi-test/default.nix
index c876ea1..7614d61 100644
--- a/systems/raspi-test/default.nix
+++ b/systems/raspi-test/default.nix
@@ -12,6 +12,7 @@
     "${inputs.self}/modules/nginx-acme-base"
     "${inputs.self}/modules/docker"
     "${inputs.self}/modules/haproxy"
+    "${inputs.self}/modules/tmux"
   ];
 
   services.nginx = {
diff --git a/systems/staubfinger/default.nix b/systems/staubfinger/default.nix
index db1fb32..a36cf93 100644
--- a/systems/staubfinger/default.nix
+++ b/systems/staubfinger/default.nix
@@ -11,6 +11,7 @@
     "${inputs.self}/modules/lockscreen"
     "${inputs.self}/modules/restic"
     "${inputs.self}/modules/tlp"
+    "${inputs.self}/modules/tmux"
   ];
   boot.initrd.availableKernelModules = [
     "aesni_intel"