diff --git a/common/base-graphical/gnome.nix b/common/base-graphical/gnome.nix
index 819ea1c..1d077de 100644
--- a/common/base-graphical/gnome.nix
+++ b/common/base-graphical/gnome.nix
@@ -6,8 +6,8 @@ let
 in
 {
   config = mkIf cfg.enable {
-    services.displayManager.gdm.enable = true;
-    services.desktopManager.gnome.enable = true;
+    services.xserver.displayManager.gdm.enable = true;
+    services.xserver.desktopManager.gnome.enable = true;
     # TODO: agree on this with randomcat as it affects her too, since for some reason this is system-wide
     # environment.gnome.excludePackages = with pkgs.gnome; [
     #   pkgs.gnome-tour
diff --git a/home/qenya/dconf/default.nix b/home/qenya/dconf/default.nix
index 466ff5b..0fe64e5 100644
--- a/home/qenya/dconf/default.nix
+++ b/home/qenya/dconf/default.nix
@@ -3,7 +3,7 @@
 # dconf is the configuration manager for GNOME.
 
 let
-  isGnome = osConfig.services.desktopManager.gnome.enable;
+  isGnome = osConfig.services.xserver.desktopManager.gnome.enable;
 in
 {
   dconf.enable = isGnome;
diff --git a/home/qenya/packages.nix b/home/qenya/packages.nix
index acc7183..2d91cc9 100644
--- a/home/qenya/packages.nix
+++ b/home/qenya/packages.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib) optionals;
   isGraphical = osConfig.services.xserver.enable;
-  isGnome = osConfig.services.desktopManager.gnome.enable;
+  isGnome = osConfig.services.xserver.desktopManager.gnome.enable;
   isPlasma = osConfig.services.desktopManager.plasma6.enable;
 in
 {
diff --git a/hosts/kilgharrah/plasma.nix b/hosts/kilgharrah/plasma.nix
index 9913dad..dba5270 100644
--- a/hosts/kilgharrah/plasma.nix
+++ b/hosts/kilgharrah/plasma.nix
@@ -4,8 +4,8 @@ let
   inherit (lib) mkForce;
 in
 {
-  services.displayManager.gdm.enable = mkForce false;
-  services.desktopManager.gnome.enable = mkForce false;
+  services.xserver.displayManager.gdm.enable = mkForce false;
+  services.xserver.desktopManager.gnome.enable = mkForce false;
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;
diff --git a/services/qenya/actual.nix b/services/qenya/actual.nix
index aeec9ff..35ce443 100644
--- a/services/qenya/actual.nix
+++ b/services/qenya/actual.nix
@@ -18,6 +18,10 @@ in
 
     services.actual = {
       enable = true;
+      # nixos 25.05 is on actual-server 25.6.1 which contains an annoying bug
+      # nixpkgs maintainers declined to backport a newer version, so get this from unstable for now
+      # ref. https://github.com/NixOS/nixpkgs/issues/423541
+      package = (import inputs.nixpkgs-unstable-small { system = "x86_64-linux"; }).actual-server;
       settings.port = 5006;
     };
   };
diff --git a/services/qenya/headscale.nix b/services/qenya/headscale.nix
index c4609f9..84833fa 100644
--- a/services/qenya/headscale.nix
+++ b/services/qenya/headscale.nix
@@ -29,7 +29,6 @@ in
         dns = {
           magic_dns = true;
           base_domain = "birdsong.network";
-          override_local_dns = false;
         };
 
         # disable built-in ACME client