diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index cb5ce4d..5b7c66b 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -1,7 +1,8 @@
-{ config
-, lib
-, pkgs
-, ...
+{
+  config,
+  lib,
+  pkgs,
+  ...
 }:
 
 with lib;
@@ -206,5 +207,9 @@ in
 
     # remote desktop
     networking.firewall.allowedTCPPorts = [ 3389 ];
+    services.gnome.gnome-remote-desktop.enable = true;
+    systemd.services.gnome-remote-desktop = {
+      wantedBy = [ "graphical.target" ];
+    };
   };
 }
diff --git a/systems/x86_64-linux/sgx/default.nix b/systems/x86_64-linux/sgx/default.nix
index acef7ed..71c746b 100644
--- a/systems/x86_64-linux/sgx/default.nix
+++ b/systems/x86_64-linux/sgx/default.nix
@@ -16,7 +16,7 @@
 
   metacfg = {
     base.enable = true;
-    gui.enable = false;
+    gui.enable = true;
     nix-ld.enable = false;
     nix.enable = true;
     podman.enable = true;
diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix
index af3504a..16d574b 100644
--- a/systems/x86_64-linux/x1/default.nix
+++ b/systems/x86_64-linux/x1/default.nix
@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 with lib;
 with lib.metacfg;
 {
@@ -132,13 +137,6 @@ with lib.metacfg;
     };
   };
 
-  services.gnome.gnome-remote-desktop.enable = true;
-  systemd.services.gnome-remote-desktop = {
-    wantedBy = [ "graphical.target" ];
-  };
-  networking.firewall.allowedTCPPorts = [ 3389 ];
-  networking.firewall.allowedUDPPorts = [ 3389 ];
-
   environment.sessionVariables = {
     LIBVA_DRIVER_NAME = "iHD";
     # NIXOS_OZONE_WL = "1";