diff --git a/flake.nix b/flake.nix
index be567e9..7f81616 100644
--- a/flake.nix
+++ b/flake.nix
@@ -137,6 +137,7 @@
           modules = [
             {nixpkgs.overlays = overlays;}
             ./hosts/op5p/configuration.nix
+            home-manager.nixosModules.home-manager
           ];
           specialArgs = {inherit myData;} // inputs;
         };
diff --git a/hosts/op5p/configuration.nix b/hosts/op5p/configuration.nix
index d13021f..6867ef9 100644
--- a/hosts/op5p/configuration.nix
+++ b/hosts/op5p/configuration.nix
@@ -1,25 +1,24 @@
-{myData, ...}: {
+{...}: {
   imports = [
+    ../../modules
     ../../shared/platform/orangepi5plus.nix
   ];
 
-  users.users = {
-    motiejus = {
-      isNormalUser = true;
-      initialHashedPassword = "";
-      openssh.authorizedKeys.keys = [myData.people_pubkeys.motiejus];
+  mj = {
+    stateVersion = "23.11";
+    timeZone = "UTC";
+    username = "nixos";
+
+    base.users = {
+      enable = true;
+      user.initialHashedPassword = "";
+      root.initialHashedPassword = "";
     };
-    root.initialHashedPassword = "";
   };
 
-  security = {
-    pam.services.lightdm.text = ''
-      auth sufficient pam_succeed_if.so user ingroup wheel
-    '';
-    sudo = {
-      enable = true;
-      wheelNeedsPassword = false;
-    };
+  security.sudo = {
+    enable = true;
+    wheelNeedsPassword = false;
   };
 
   networking = {
@@ -27,18 +26,4 @@
     domain = "jakstys.lt";
     firewall.allowedTCPPorts = [22];
   };
-
-  nix = {
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      trusted-users = nixos
-    '';
-    settings = {
-      experimental-features = ["nix-command" "flakes"];
-      trusted-users = ["motiejus"];
-    };
-  };
-
-  time.timeZone = "UTC";
-  system.stateVersion = "23.11";
 }