diff --git a/nixos/fuchsia/configuration.nix b/nixos/fuchsia/configuration.nix
index 80b471b..9f9b7a1 100644
--- a/nixos/fuchsia/configuration.nix
+++ b/nixos/fuchsia/configuration.nix
@@ -64,14 +64,6 @@
       qmk-udev-rules
     ];
 
-    # Setup our display server.
-    xserver = {
-      enable = true;
-      xkb.layout = "au";
-      videoDrivers = [ "amdgpu" ];
-      displayManager.startx.enable = true;
-    };
-
     libinput = {
       enable = true;
       mouse = { accelProfile = "flat"; };
diff --git a/nixos/fuchsia/services/default.nix b/nixos/fuchsia/services/default.nix
index 3a52f17..5fc2fc0 100644
--- a/nixos/fuchsia/services/default.nix
+++ b/nixos/fuchsia/services/default.nix
@@ -4,5 +4,6 @@
   imports = [
     ./amdgpu-clocks.nix
     ./flatpak.nix
+    ./xserver.nix
   ];
 }
diff --git a/nixos/fuchsia/services/xserver.nix b/nixos/fuchsia/services/xserver.nix
new file mode 100644
index 0000000..126a074
--- /dev/null
+++ b/nixos/fuchsia/services/xserver.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  # Setup our display server
+  services.xserver = {
+    enable = true;
+    xkb.layout = "au";
+    videoDrivers = [ "amdgpu" ];
+    displayManager.startx.enable = true;
+  };
+}