diff --git a/src/common/logging/vst3.cpp b/src/common/logging/vst3.cpp
index e19ad68f..2e4b5342 100644
--- a/src/common/logging/vst3.cpp
+++ b/src/common/logging/vst3.cpp
@@ -1759,7 +1759,7 @@ void Vst3Logger::log_response(
         if (response.result == Steinberg::kResultOk) {
             message << ", "
                     << format_uid(Steinberg::FUID::fromTUID(
-                           response.editor_cid.data()));
+                           response.editor_cid.get_native_uid().data()));
         }
     });
 }
diff --git a/src/common/serialization/vst3/plugin/component.h b/src/common/serialization/vst3/plugin/component.h
index 83eb9109..30f7248f 100644
--- a/src/common/serialization/vst3/plugin/component.h
+++ b/src/common/serialization/vst3/plugin/component.h
@@ -73,12 +73,12 @@ class YaComponent : public Steinberg::Vst::IComponent {
      */
     struct GetControllerClassIdResponse {
         UniversalTResult result;
-        ArrayUID editor_cid;
+        WineUID editor_cid;
 
         template <typename S>
         void serialize(S& s) {
             s.object(result);
-            s.container1b(editor_cid);
+            s.object(editor_cid);
         }
     };
 
diff --git a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp
index bb3922e9..4eed113d 100644
--- a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp
+++ b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp
@@ -169,8 +169,8 @@ Vst3PluginProxyImpl::getControllerClassId(Steinberg::TUID classId) {
                 YaComponent::GetControllerClassId{.instance_id =
                                                       instance_id()});
 
-        std::copy(response.editor_cid.begin(), response.editor_cid.end(),
-                  classId);
+        ArrayUID native_uid = response.editor_cid.get_native_uid();
+        std::copy(native_uid.begin(), native_uid.end(), classId);
 
         return response.result;
     } else {
diff --git a/src/wine-host/bridges/vst3.cpp b/src/wine-host/bridges/vst3.cpp
index f7ebb351..932e95ef 100644
--- a/src/wine-host/bridges/vst3.cpp
+++ b/src/wine-host/bridges/vst3.cpp
@@ -1149,7 +1149,7 @@ size_t Vst3Bridge::register_object_instance(
                                 .component->getControllerClassId(cid);
 
                         return YaComponent::GetControllerClassIdResponse{
-                            .result = result, .editor_cid = std::to_array(cid)};
+                            .result = result, .editor_cid = cid};
                     },
                     [&](const YaComponent::SetIoMode& request)
                         -> YaComponent::SetIoMode::Response {