diff --git a/common/default.nix b/common/default.nix
index 98e4eda..739c0b5 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -15,7 +15,6 @@ in
     ./nitrokey.nix
     ./nix-settings.nix
     ./upgrade-diff.nix
-    ./guest.nix
   ];
 
   services.davfs2.enable = true;
diff --git a/common/guest.nix b/common/guest.nix
deleted file mode 100644
index 7183bc1..0000000
--- a/common/guest.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  config,
-  lib,
-  system,
-  ...
-}:
-let
-  inputs = config.inputInjection.flake-inputs;
-in
-{
-  # interesting: this causes an infinite recursion
-  #imports = [ config.inputInjection.flake-inputs.home-manager.nixosModules.home-manager ];
-
-  options.schmittlauch.guestUser.enable = lib.options.mkEnableOption "Provide a guest user account";
-
-  config = lib.mkIf config.schmittlauch.guestUser.enable {
-    users.extraUsers.gast = {
-      isNormalUser = true;
-      group = "gast";
-      hashedPassword = "$y$j9T$pPCjU8ZvVYo0aY4jtrHPj1$NxUWOP/YTcqJ1PYaP1Hy5MwTeDcNjg0k369R5rE5M48";
-    };
-    users.groups.gast = { };
-    # a basic home-manager configuration to share installed packages of other accounts
-    # reason: keeping a separate config checkout for guests and requiring them to run
-    # their own `home-manager` instance does not make sense.
-    home-manager =
-      let
-        gast = config.users.extraUsers.gast;
-      in
-      {
-        useGlobalPkgs = false; # to allow usage of home-level overlays
-        # FIXME: possibly expose home modules through flake outputs instead of brittle path traversals
-        users.gast = {
-          imports = [
-            inputs.nur.hmModules.nur
-            ../home/modules/packages.nix
-          ];
-          home = {
-            username = gast.name;
-            homeDirectory = gast.home;
-            stateVersion = "24.05";
-          };
-          schmittlauch = {
-            packages = {
-              graphics = true;
-              multimedia = true;
-              nixHelpers = true;
-              devTools = true;
-              pythonTools = true;
-              games = true;
-              desktopLinux = true;
-              kde = true;
-            };
-          };
-
-        };
-        # Optionally use extraSpecialArgs
-        # to pass through arguments to home.nix
-        extraSpecialArgs = {
-          inherit inputs system;
-        };
-
-      };
-
-  };
-}
diff --git a/flake.lock b/flake.lock
index bb9e943..b2aa4fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -210,11 +210,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1722630782,
-        "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
+        "lastModified": 1722421184,
+        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
+        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1722791413,
-        "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
+        "lastModified": 1722519197,
+        "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
+        "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
         "type": "github"
       },
       "original": {
@@ -274,11 +274,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1722894411,
-        "narHash": "sha256-OUOJ/dglPQ/YAN/zYAdEzzhSUv84QF8px9JT4eQb4GA=",
+        "lastModified": 1722709906,
+        "narHash": "sha256-I27FkJ3qSsxc5aZSwpYHMqJwLpvQt6eV4MrwGfVjCvM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1261ebf63933d763c7eb2e3290782cf09d045fdb",
+        "rev": "ac1226f223779364c73f1a450654383768dab1b7",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 796a574..16786b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,13 +59,7 @@
             flake-inputs = inputs;
           };
         };
-      defaultModules = system: [
-        inputInjection
-
-        # for some reason, `imports`-ing the home-manager module via inputInjection
-        # from a sub-module causes infinite recursion, so importing it here instead
-        home-manager.nixosModules.home-manager
-      ];
+      defaultModules = system: [ inputInjection ];
       mkSystem =
         system: extraModules:
         nixpkgs.lib.nixosSystem rec {
@@ -121,7 +115,6 @@
         modules = [
           ./darwin/configuration.nix
           inputInjection
-
         ];
       };
       homeConfigurations = {
diff --git a/hosts/thinknix/default.nix b/hosts/thinknix/default.nix
index 75bd887..518f8ce 100644
--- a/hosts/thinknix/default.nix
+++ b/hosts/thinknix/default.nix
@@ -22,8 +22,6 @@
     speed = 180;
   };
 
-  schmittlauch.guestUser.enable = true;
-
   networking.hostName = "thinknix";
 
   # This value determines the NixOS release with which your system is to be