diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 2fada3bb..9824883f 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -304,6 +304,7 @@ in
     nvme-cli
     borgbackup
     bind
+    waypipe
     (callPackage ./afws { inherit pkgs; })
     (callPackage ./labelprinter { inherit pkgs; })
   ];
@@ -325,7 +326,6 @@ in
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-  services.openssh.forwardX11 = true;
   services.openssh.passwordAuthentication = false;
   services.openssh.gatewayPorts = "clientspecified";
   programs.mosh.enable = true;
diff --git a/nixops/desktop.nix b/nixops/desktop.nix
index f8ba22f8..b9e50407 100644
--- a/nixops/desktop.nix
+++ b/nixops/desktop.nix
@@ -82,7 +82,6 @@ in
   };
 
   services.openssh.enable = true;
-  services.openssh.forwardX11 = true;
   services.openssh.passwordAuthentication = false;
   services.openssh.extraConfig =
     ''