diff --git a/hosts/igor/default.nix b/hosts/igor/default.nix
index 0c51b03..0517cbf 100644
--- a/hosts/igor/default.nix
+++ b/hosts/igor/default.nix
@@ -16,6 +16,7 @@
     ../../modules/ssh.nix
     ../../modules/tailscale
     ../../modules/vsftpd
+    ../../modules/mosh.nix
   ];
 
   config.boot.loader.grub.enable = true;
@@ -110,7 +111,6 @@
 
   config.programs.firefox.enable = true;
   config.programs.git.enable = true;
-  config.programs.mosh.enable = true;
   config.programs.nm-applet.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 09bf600..c60c2e6 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -29,6 +29,7 @@ in
     ../../modules/ssh.nix
     ../../modules/hledger-web.nix
     ../../modules/tailscale
+    ../../modules/mosh.nix
   ];
 
   # Use the GRUB 2 boot loader.
@@ -89,7 +90,6 @@ in
         ];
         allowedUDPPorts = [
           53
-          42666
         ];
       };
 
@@ -172,7 +172,6 @@ in
     enableSSHSupport = true;
   };
 
-  programs.mosh.enable = true;
   programs.neovim = {
     enable = true;
     defaultEditor = true;
diff --git a/modules/mosh.nix b/modules/mosh.nix
new file mode 100644
index 0000000..d4c165f
--- /dev/null
+++ b/modules/mosh.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  programs.mosh = {
+    enable = true;
+    openFirewall = true;
+  };
+}