diff --git a/flake.nix b/flake.nix
index 2d8f24d..571995a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,6 @@
           # Features common to all of my machines
           ./features/self-ide.nix
           ./features/block-socialmedia.nix
-          ./features/desktopish
           ./features/caches
           ./features/current-location.nix
           ./features/passwordstore.nix
@@ -62,7 +61,7 @@
         [
           inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
           #./features/desktopish/fonts.nix
-          # ./features/server-mode.nix
+          ./features/server-mode.nix
           # ./features/postgrest.nix
         ];
       nixosConfigurations.x1c7 = mkHomeMachine
@@ -70,6 +69,7 @@
         [
           inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen
           ./features/email
+          ./features/desktopish
         ];
     };
 }
diff --git a/hosts/p71.nix b/hosts/p71.nix
index a9b2f65..cccea0f 100644
--- a/hosts/p71.nix
+++ b/hosts/p71.nix
@@ -62,7 +62,7 @@
 
   # Enable the X11 windowing system.
   services.xserver = {
-    enable = true;
+    enable = false;
     videoDrivers = [ "nvidia" "intel" ];
     #displayManager.gdm.enable = true;
     #desktopManager.gnome.enable = true;