diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
index abc8d5a32b5f0..8d575df5c8b8f 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
@@ -37,7 +37,7 @@ fun AbstractFirRegularClassBuilder.generateValuesFunction(session: FirSession, p
             type = ConeClassLikeTypeImpl(
                 ConeClassLikeLookupTagImpl(StandardClassIds.Array),
                 arrayOf(
-                    ConeClassLikeTypeImpl(ConeClassLikeLookupTagImpl(this@generateValuesFunction.symbol.classId), emptyArray(), isNullable = false)
+                    ConeClassLikeTypeImpl(this@generateValuesFunction.symbol.toLookupTag(), emptyArray(), isNullable = false)
                 ),
                 isNullable = false
             )
@@ -59,7 +59,7 @@ fun AbstractFirRegularClassBuilder.generateValueOfFunction(session: FirSession,
         returnTypeRef = buildResolvedTypeRef {
             source = this@generateValueOfFunction.source
             type = ConeClassLikeTypeImpl(
-                ConeClassLikeLookupTagImpl(this@generateValueOfFunction.symbol.classId),
+                this@generateValueOfFunction.symbol.toLookupTag(),
                 emptyArray(),
                 isNullable = false
             )