diff --git a/flake.lock b/flake.lock
index fe8c98d..6035116 100644
--- a/flake.lock
+++ b/flake.lock
@@ -158,21 +158,6 @@
         "type": "github"
       }
     },
-    "crane_3": {
-      "locked": {
-        "lastModified": 1779130139,
-        "narHash": "sha256-BLrtr42azquO7MdGFU5a7KiMl3YpFlTeIXqy1fT5GlQ=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "edb38893982a3338972bb4a2ec7ce7c29ba10fd9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -901,7 +886,9 @@
     },
     "servicepoint-cli": {
       "inputs": {
-        "crane": "crane_3",
+        "naersk": [
+          "naersk"
+        ],
         "nix-filter": [
           "nix-filter"
         ],
@@ -913,11 +900,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779909128,
-        "narHash": "sha256-H1NNRXwM1/tpRY+qDgEpfietLZ83oAbac0CHOD8TxjE=",
+        "lastModified": 1771709842,
+        "narHash": "sha256-zbKj2waitgCFE/I4DcV4lWMRkQ7gDOa9QgPXVTao5+g=",
         "ref": "refs/heads/main",
-        "rev": "0457966ae9927bad1b0b931b8e09e2c03cdde88d",
-        "revCount": 53,
+        "rev": "6c731e3f5ac0fc63e3cf1e727856f3a3327fddfb",
+        "revCount": 52,
         "type": "git",
         "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"
       },
diff --git a/flake.nix b/flake.nix
index 9949386..212e0aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,7 @@
       url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
       inputs = {
         nixpkgs.follows = "nixpkgs";
+        naersk.follows = "naersk";
         nix-filter.follows = "nix-filter";
         treefmt-nix.follows = "treefmt-nix";
       };
diff --git a/homeConfigurations/ronja/default.nix b/homeConfigurations/ronja/default.nix
index 8ef3e07..4d5c5ee 100644
--- a/homeConfigurations/ronja/default.nix
+++ b/homeConfigurations/ronja/default.nix
@@ -36,7 +36,7 @@
           ];
         };
         shellAliases = {
-          myos-update = ''echo "Enter sudo password" && sudo nixos-rebuild boot --flake git+https://forge.darkest.space/mara/nixos-configs.git --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json'';
+          myos-update = ''echo "Enter sudo password" && sudo nixos-rebuild boot --flake git+https://git.berlin.ccc.de/vinzenz/nixos-configuration.git --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json'';
           myos-apply = ''echo "Enter sudo password" && sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json'';
         };
       };
diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix
index 43e998a..6f6edce 100644
--- a/nixosConfigurations.nix
+++ b/nixosConfigurations.nix
@@ -55,7 +55,7 @@ forDevice (
         networking.hostName = device;
         system = {
           stateVersion = "22.11";
-          autoUpgrade.flake = "git+https://forge.darkest.space/mara/nixos-configs.git";
+          autoUpgrade.flake = "git+https://git.berlin.ccc.de/vinzenz/nixos-configuration.git";
         };
         nix.settings.experimental-features = [
           "nix-command"
diff --git a/nixosModules/gnome.nix b/nixosModules/gnome.nix
index ff8dfaa..fd195e8 100644
--- a/nixosModules/gnome.nix
+++ b/nixosModules/gnome.nix
@@ -13,28 +13,11 @@
   config = lib.mkIf config.my.gnome.enable (
     lib.mkMerge [
       {
-        # Workaround for GDM 50 + NixOS 26.05: greeter PAM session strips PATH so
-        # gdm-wayland-session can't find `gnome-session` and exits 70.
-        # https://github.com/NixOS/nixpkgs/issues/523332 — drop once #523948 lands.
-        security.pam.services.gdm-launch-environment.rules.session.env-greeter = {
-          control = "required";
-          modulePath = "${config.security.pam.package}/lib/security/pam_env.so";
-          settings.conffile = pkgs.writeText "gdm-launch-environment-env-conf" ''
-            PATH          DEFAULT="''${PATH}:${pkgs.gnome-session}/bin"
-            XDG_DATA_DIRS DEFAULT="''${XDG_DATA_DIRS}:/run/current-system/sw/share"
-          '';
-          settings.readenv = 0;
-          order = 12200;
-        };
-
         services = {
           xserver.excludePackages = [ pkgs.xterm ];
 
           # Enable the GNOME Desktop Environment.
-          displayManager.gdm = {
-            enable = true;
-            debug = true;
-          };
+          displayManager.gdm.enable = true;
           desktopManager.gnome = {
             enable = true;
             extraGSettingsOverridePackages = [ pkgs.mutter ];