diff --git a/configuration.nix b/configuration.nix
index 86e4bd5..1a42b4d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,8 +2,6 @@
 {
   imports =
     [ 
-      # Home Manager
-      <home-manager/nixos>
       # Packages
       ./packages/customizationpkgs.nix
       ./packages/devpkgs.nix
diff --git a/flake.nix b/flake.nix
index 2364600..af73868 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
     plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
     plasma-manager.inputs.home-manager.follows = "home-manager";
   };
-  outputs = { self,nixpkgs,nixpkgs-stable, home-manager, jovian, plasma-manager, ...}:
+  outputs = { self, nixpkgs, nixpkgs-stable, home-manager, jovian, plasma-manager,  ...}:
    let
     lib = nixpkgs.lib;
     system = "x86_64-linux";
@@ -20,14 +20,19 @@
     nixosConfigurations = {
       computer-mo = nixpkgs.lib.nixosSystem {
        inherit system;
+       specialArgs = { inherit pkgs pkgs-stable; };
        modules = [
           ./configuration.nix
           jovian.nixosModules.default
           home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.extraSpecialArgs = {inherit pkgs;};
+            home-manager.users.mo.imports = [./home.nix];
+            home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager];
+          }
        ];
-       specialArgs = {
-         inherit pkgs-stable;
-       };
       };
     };
  };