diff --git a/flake.nix b/flake.nix
index be8c3c7..f079a70 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,20 +21,22 @@
   outputs = inputs@{ self, nixpkgs, home-manager, agenix, birdsong, ... }: {
     colmena = {
       meta.nixpkgs = import nixpkgs { system = "x86_64-linux"; };
-      nodeNixpkgs.kalessin = import nixpkgs { system = "aarch64-linux"; }; # TODO: this should be generated from the host config somehow
+      meta.nodeNixpkgs.kalessin = import nixpkgs { system = "aarch64-linux"; }; # TODO: this should be generated from the host config somehow
 
       defaults = { name, nodes, config, lib, pkgs, ... }: {
         deployment.replaceUnknownProfiles = lib.mkDefault false;
         networking.hostName = name;
 
         nix.settings.experimental-features = "nix-command flakes";
+        nixpkgs.flake.source = nixpkgs;
+        nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
 
         nixpkgs.config = {
           allowUnfree = true;
           packageOverrides = pkgs:
             let sources = import ./npins;
             in {
-              agenix = agenix.packages.x86_64-linux.default; # TODO: This should check the host architecture
+              agenix = agenix.packages.${config.nixpkgs.hostPlatform.system}.default;
               nur = (import sources.nur { inherit pkgs; });
             };
         };
diff --git a/home/vscode.nix b/home/vscode.nix
index d081191..80c4389 100644
--- a/home/vscode.nix
+++ b/home/vscode.nix
@@ -1,9 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, osConfig, ... }:
 
 let
   inherit (lib) mkIf;
   inherit (pkgs) fetchFromGitHub;
-  system = "x86_64-linux"; # TODO: This should check the host architecture
+  inherit (osConfig.nixpkgs.hostPlatform) system;
   extensions =
     (import (fetchFromGitHub {
       # On a stable channel, do NOT keep this up-to-date! VS Code extensions
@@ -13,7 +13,8 @@ let
       rev = "27ce569a199d2da1a8483fe3d69dd41664da3a63";
       hash = "sha256-yyB4Kh3EFbYP+1JHza/IEeHwABypcYVi6vvWTmad/rY=";
     })).extensions.${system};
-in {
+in
+{
   programs.vscode = {
     enableExtensionUpdateCheck = false;
     enableUpdateCheck = false;