diff --git a/hosts/mothership/default.nix b/hosts/mothership/default.nix
index bc5ebbe..04857e4 100644
--- a/hosts/mothership/default.nix
+++ b/hosts/mothership/default.nix
@@ -10,6 +10,7 @@
     "common"
     "wireguard-server"
     "ssh"
+    "mosh"
     "ccr"
     "nix"
   ];
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 705c8f6..c2a4164 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -26,6 +26,7 @@
       "printing"
       "qmk-udev"
       "ssh"
+      "mosh"
       "transmission"
       "udisks2"
       "xdg"
diff --git a/modules/mosh/default.nix b/modules/mosh/default.nix
new file mode 100644
index 0000000..1c2e34e
--- /dev/null
+++ b/modules/mosh/default.nix
@@ -0,0 +1,3 @@
+{
+  programs.mosh.enable = true;
+}