diff --git a/systems/_common/components/gnome_wayland.nix b/systems/_common/components/gnome_wayland.nix
index 1845bde..78e2940 100644
--- a/systems/_common/components/gnome_wayland.nix
+++ b/systems/_common/components/gnome_wayland.nix
@@ -1,12 +1,14 @@
 { pkgs, ... }:
 {
-  services.xserver.enable = true;
-  services.xserver.displayManager.gdm = {
+  services.xserver = {
     enable = true;
-    autoSuspend = false;
-    wayland = true;
+    displayManager.gdm = {
+      enable = true;
+      autoSuspend = false;
+      wayland = true;
+    };
+    desktopManager.gnome.enable = true;
   };
-  services.xserver.desktopManager.gnome.enable = true;
   services.gnome.core-utilities.enable = false;
   environment.systemPackages = with pkgs; [
     gnome.dconf-editor