diff --git a/kernel/consteval.h b/kernel/consteval.h
index b13c7ea5c..7450661b2 100644
--- a/kernel/consteval.h
+++ b/kernel/consteval.h
@@ -24,6 +24,7 @@
 #include "kernel/sigtools.h"
 #include "kernel/celltypes.h"
 #include "kernel/macc.h"
+#include "kernel/newcelltypes.h"
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -40,9 +41,8 @@ struct ConstEval
 
 	ConstEval(RTLIL::Module *module, RTLIL::State defaultval = RTLIL::State::Sm) : module(module), assign_map(module), defaultval(defaultval)
 	{
-		CellTypes ct;
-		ct.setup_internals();
-		ct.setup_stdcells();
+		auto ct = NewCellTypes();
+		ct.static_cell_types = StaticCellTypes::Compat::stdcells_nomem_noff;
 
 		for (auto &it : module->cells_) {
 			if (!ct.cell_known(it.second->type))
diff --git a/kernel/newcelltypes.h b/kernel/newcelltypes.h
index 005b4c117..28584b1f1 100644
--- a/kernel/newcelltypes.h
+++ b/kernel/newcelltypes.h
@@ -554,6 +554,8 @@ namespace Compat {
 	static constexpr auto internals_mem_ff = Categories::meet(internals_all, mem_ff);
 	// old setup_internals
 	static constexpr auto internals_nomem_noff = Categories::meet(internals_all, nomem_noff);
+	// old setup_stdcells
+	static constexpr auto stdcells_nomem_noff = Categories::meet(categories.is_stdcell, nomem_noff);
 	static constexpr auto stdcells_mem = Categories::meet(categories.is_stdcell, categories.is_mem_noff);
 };