diff --git a/pkgs/intel-oneapi/deb/2023.nix b/pkgs/intel-oneapi/deb/2023.nix
index 0294f321..ead3f2e1 100644
--- a/pkgs/intel-oneapi/deb/2023.nix
+++ b/pkgs/intel-oneapi/deb/2023.nix
@@ -42,15 +42,15 @@ let
 
   findMatch = name:
   let
-    aptPackages = builtins.fromJSON (builtins.readFile ./packages.json);
-    matches = lib.filter (x: name == x.pname) aptPackages;
+    aptPackages = builtins.getAttr "hpckit-2023-1-0" (builtins.fromTOML (builtins.readFile ./packages.toml));
+    matches = lib.filter (x: lib.hasPrefix name (x.name + "-" + x.version)) aptPackages;
     n = lib.length matches;
     match = builtins.traceVerbose (name + " -- ${builtins.toString n}") (builtins.head matches);
 
     apthost = "https://apt.repos.intel.com/oneapi/";
   in
     {
-      url = apthost + match.filename;
+      url = apthost + match.file;
       sha256 = match.sha256;
     };
 
@@ -299,7 +299,7 @@ let
     src = joinDebs pname [
       # C/C++
       "intel-oneapi-dpcpp-cpp-${version}"
-      "intel-oneapi-compiler-dpcpp-cpp-${version}"
+      # "intel-oneapi-compiler-dpcpp-cpp-${version}"
       "intel-oneapi-compiler-dpcpp-cpp-common-${version}"
       "intel-oneapi-compiler-dpcpp-cpp-runtime-${version}"
       "intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-${version}"