diff --git a/.classpath b/.classpath
index d9603574f..1f35439d0 100644
--- a/.classpath
+++ b/.classpath
@@ -17,7 +17,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/com.oracle.truffle.object"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.oracle.truffle.object.basic"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.oracle.truffle.api.profiles"/>
-	<classpathentry kind="src" path="/com.oracle.truffle.tools"/>
 	<classpathentry kind="lib" path="libs/somns-deps-dev.jar" sourcepath="libs/somns-deps-source.jar"/>
 	<classpathentry kind="lib" path="libs/somns-deps.jar" sourcepath="libs/somns-deps-source.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/BlackDiamonds"/>
diff --git a/build.xml b/build.xml
index d026b87a2..40c626127 100644
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,9 @@
     <property name="graal.dir"   location="${lib.dir}/truffle/compiler" />
     <property name="truffle.dir" location="${lib.dir}/truffle/truffle" />
     <property name="sdk.dir"     location="${lib.dir}/truffle/sdk" />
+    <property name="tools.dir"   location="${lib.dir}/truffle/tools" />
     <property name="sdk.build"   location="${sdk.dir}/mxbuild/dists" />
+    <property name="tools.build" location="${tools.dir}/mxbuild/dists" />
     <property name="truffle.build" location="${truffle.dir}/mxbuild/dists" />
     <property name="somns-deps.version" value="0.3.3" />
     <property name="checkstyle.version" value="8.11" />
diff --git a/src/som/VM.java b/src/som/VM.java
index 22dd2310d..2b5485c68 100644
--- a/src/som/VM.java
+++ b/src/som/VM.java
@@ -18,8 +18,7 @@
 import com.oracle.truffle.api.vm.PolyglotEngine.Builder;
 import com.oracle.truffle.api.vm.PolyglotEngine.Value;
 import com.oracle.truffle.api.vm.PolyglotRuntime.Instrument;
-import com.oracle.truffle.tools.Profiler;
-import com.oracle.truffle.tools.ProfilerInstrument;
+import com.oracle.truffle.tools.profiler.CPUSampler;
 
 import bd.inlining.InlinableNodes;
 import coveralls.truffle.Coverage;
@@ -61,7 +60,7 @@ public final class VM {
 
   @CompilationFinal private StructuralProbe structuralProbe;
   @CompilationFinal private WebDebugger     webDebugger;
-  @CompilationFinal private Profiler        truffleProfiler;
+  @CompilationFinal private CPUSampler      truffleProfiler;
 
   private final ForkJoinPool actorPool;
   private final ForkJoinPool forkJoinPool;
@@ -366,15 +365,8 @@ private void startExecution(final Builder builder) {
     Map<String, ? extends Instrument> instruments = engine.getRuntime().getInstruments();
 
     if (options.profilingEnabled) {
-      Instrument profiler = instruments.get(ProfilerInstrument.ID);
-      if (profiler == null) {
-        Output.errorPrintln("Truffle profiler not available. Might be a class path issue");
-      } else {
-        profiler.setEnabled(options.profilingEnabled);
-        truffleProfiler = Profiler.find(engine);
-        truffleProfiler.setCollecting(true);
-        truffleProfiler.setTiming(true);
-      }
+      truffleProfiler = CPUSampler.find(engine);
+      truffleProfiler.setCollecting(true);
     }
 
     Debugger debugger = null;