diff --git a/flake.nix b/flake.nix
index ef5839c..ca27da5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,6 @@
   inputs = {
     nixpkgs.url = "flake:nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0";
     simple-nixos-mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
       inputs = {
@@ -20,46 +19,50 @@
     };
   };
 
-  outputs = inputs@{ self, utils, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: utils.lib.mkFlake {
+  outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: {
 
-    inherit self inputs;
-
-    channels.nixpkgs-unstable.config = { allowUnfree = true; };
-
-    supportedSystems = [ "x86_64-linux" ];
-
-    # Patch example
-
-    # channels.nixpkgs-unstable.patches = [
-    #   (nixpkgs-unstable.legacyPackages."x86_64-linux".fetchpatch {
-    #     name = "electron-cash.patch";
-    #     url = "https://github.com/NixOS/nixpkgs/pull/160607.patch";
-    #     sha256 = nixpkgs.lib.fakeHash;
-    #   })
-    # ];
-
-    hostDefaults.modules = [
-      nixpkgs.nixosModules.notDetected
-      {
-        nix.generateRegistryFromInputs = true;
-        nix.linkInputs = true;
-        nix.generateNixPathFromInputs = true;
-      }
-    ];
-
-    hosts.loutreos.modules = [
-      simple-nixos-mailserver.nixosModule
-      dogetipbot-telegram.nixosModule
-      ipmihddtemp.nixosModule
-      ./systems/LoutreOS/configuration.nix
-    ];
-
-    hosts.paul-fixe = {
-      channelName = "nixpkgs-unstable";
+    nixosConfigurations.paul-fixe = nixpkgs-unstable.lib.nixosSystem {
+      system = "x86_64-linux";
       modules = [
+        nixpkgs-unstable.nixosModules.notDetected
+        {
+          nixpkgs.config.allowUnfree = true;
+          nix = {
+            settings.experimental-features = [ "nix-command" "flakes" ];
+            registry = {
+              nixpkgs.to = {
+                type = "path";
+                path = nixpkgs-unstable.legacyPackages.x86_64-linux.path;
+              };
+            };
+          };
+        }
         ./systems/PC-Fixe/configuration.nix
       ];
     };
+
+    nixosConfigurations.loutreos = nixpkgs-unstable.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        nixpkgs-unstable.nixosModules.notDetected
+        simple-nixos-mailserver.nixosModule
+        dogetipbot-telegram.nixosModule
+        ipmihddtemp.nixosModule
+        {
+          nix = {
+            settings.experimental-features = [ "nix-command" "flakes" ];
+            registry = {
+              nixpkgs.to = {
+                type = "path";
+                path = nixpkgs.legacyPackages.x86_64-linux.path;
+              };
+            };
+          };
+        }
+        ./systems/LoutreOS/configuration.nix
+      ];
+    };
+
   };
 }