diff --git a/systems/BASED.nix b/systems/BASED.nix
index 4ddca6f..a4e7758 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -128,6 +128,11 @@
     DefaultTimeoutStopSec=15s
   '';
 
+  zramSwap = {
+    enable = true;
+    algorithm = "zstd";
+  };
+
   boot.loader.systemd-boot.enable = lib.mkDefault true;
   boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
   boot.loader.timeout = lib.mkForce 1;
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index a299d09..8c649bd 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -3,10 +3,6 @@
   pkgs,
   ...
 }: {
-  zramSwap = {
-    enable = true;
-    algorithm = "zstd";
-  };
   # nixpkgs.overlays = [
   #   (final: prev: {
   #     libinput = prev.libinput.overrideAttrs (old: {
@@ -25,11 +21,13 @@
     nvtopPackages.amd
   ];
 
+  services.tailscale.useRoutingFeatures = "client";
+
   nix.buildMachines = [
     {
       hostName = "nocomputer";
       systems = ["x86_64-linux" "i686-linux"];
-      supportedFeatures = ["big-parallel"];
+      supportedFeatures = ["big-parallel" "kvm" "nixos-test" "benchmark"];
     }
   ];
   nix.extraOptions = ''
diff --git a/systems/NOmom.nix b/systems/NOmom.nix
index 251761f..c9aea7e 100644
--- a/systems/NOmom.nix
+++ b/systems/NOmom.nix
@@ -12,7 +12,7 @@
   services.fprintd.enable = true;
   hardware.sensor.iio.enable = true;
 
-  services.xserver.displayManager.defaultSession = "plasma";
+  services.displayManager.defaultSession = "plasma";
   services.displayManager.sddm.wayland.enable = true;
 
   # systemd.user.services.backlight = {