diff --git a/src/geode/io/model/gid_output.cpp b/src/geode/io/model/gid_output.cpp
index 2e86b3f..e138f76 100644
--- a/src/geode/io/model/gid_output.cpp
+++ b/src/geode/io/model/gid_output.cpp
@@ -121,11 +121,11 @@ namespace
                 for( const auto& cmv :
                     brep_.component_mesh_vertices( uv_index ) )
                 {
-                    if( cmv.component_id.type()
+                    if( cmv.component_id.type
                         == geode::Block3D::component_type_static() )
                     {
                         file_ << uv_index + NODE_OFFSET << geode::SPACE;
-                        file_ << brep_.block( cmv.component_id.id() )
+                        file_ << brep_.block( cmv.component_id.id )
                                      .mesh()
                                      .point( cmv.vertex )
                                      .string()
@@ -179,12 +179,12 @@ namespace
             bool is_vertex_in_block = false;
             for( const auto& cmv : brep_.component_mesh_vertices( uv_index ) )
             {
-                if( cmv.component_id.type()
+                if( cmv.component_id.type
                     == geode::Surface3D::component_type_static() )
                 {
                     is_vertex_on_surface = true;
                 }
-                else if( cmv.component_id.type()
+                else if( cmv.component_id.type
                          == geode::Block3D::component_type_static() )
                 {
                     is_vertex_in_block = true;
@@ -208,7 +208,7 @@ namespace
                     brep_.component_mesh_vertices( uv_index ) )
                 {
                     file_ << uv_index + NODE_OFFSET << geode::SPACE;
-                    file_ << brep_.surface( cmv.component_id.id() )
+                    file_ << brep_.surface( cmv.component_id.id )
                                  .mesh()
                                  .point( cmv.vertex )
                                  .string()
diff --git a/src/geode/io/model/msh_input.cpp b/src/geode/io/model/msh_input.cpp
index fc8a162..1352dbd 100644
--- a/src/geode/io/model/msh_input.cpp
+++ b/src/geode/io/model/msh_input.cpp
@@ -653,13 +653,13 @@ namespace
                                 { line.component_id(), e1 } ) );
                         for( const auto& cmv0 : cmvs0 )
                         {
-                            if( cmv0.component_id.id() != surface.id() )
+                            if( cmv0.component_id.id != surface.id() )
                             {
                                 continue;
                             }
                             for( const auto& cmv1 : cmvs1 )
                             {
-                                if( cmv1.component_id.id() != surface.id() )
+                                if( cmv1.component_id.id != surface.id() )
                                 {
                                     continue;
                                 }
@@ -810,8 +810,8 @@ namespace
             {
                 for( const auto& incidence_vertex : incidence_type_vertices )
                 {
-                    b2i_relations[boundary_vertex.component_id.id()].emplace(
-                        incidence_vertex.component_id.id() );
+                    b2i_relations[boundary_vertex.component_id.id].emplace(
+                        incidence_vertex.component_id.id );
                 }
             }
         }
@@ -825,13 +825,13 @@ namespace
         {
             for( const auto& boundary_vertex : boundary_type_vertices )
             {
-                if( b2i_relations.find( boundary_vertex.component_id.id() )
+                if( b2i_relations.find( boundary_vertex.component_id.id )
                     == b2i_relations.end() )
                 {
                     continue;
                 }
                 auto& incidences_in_relations =
-                    b2i_relations.at( boundary_vertex.component_id.id() );
+                    b2i_relations.at( boundary_vertex.component_id.id );
 
                 auto it = incidences_in_relations.cbegin();
                 while( it != incidences_in_relations.cend() )
@@ -842,7 +842,7 @@ namespace
                             incidence_type_vertices.end(),
                             [&incidence_id](
                                 const geode::ComponentMeshVertex& cmv ) {
-                                return cmv.component_id.id() == incidence_id;
+                                return cmv.component_id.id == incidence_id;
                             } )
                         == incidence_type_vertices.end() )
                     {
@@ -864,25 +864,25 @@ namespace
             std::vector< geode::ComponentMeshVertex > blocks_vertices;
             for( const auto& cmv : brep_.component_mesh_vertices( uv ) )
             {
-                if( cmv.component_id.type()
+                if( cmv.component_id.type
                     == geode::Corner3D::component_type_static() )
                 {
                     corners_vertices.push_back( cmv );
                     continue;
                 }
-                if( cmv.component_id.type()
+                if( cmv.component_id.type
                     == geode::Line3D::component_type_static() )
                 {
                     lines_vertices.push_back( cmv );
                     continue;
                 }
-                if( cmv.component_id.type()
+                if( cmv.component_id.type
                     == geode::Surface3D::component_type_static() )
                 {
                     surfaces_vertices.push_back( cmv );
                     continue;
                 }
-                if( cmv.component_id.type()
+                if( cmv.component_id.type
                     == geode::Block3D::component_type_static() )
                 {
                     blocks_vertices.push_back( cmv );
diff --git a/src/geode/io/model/svg_input.cpp b/src/geode/io/model/svg_input.cpp
index 5021060..26157c4 100644
--- a/src/geode/io/model/svg_input.cpp
+++ b/src/geode/io/model/svg_input.cpp
@@ -399,8 +399,8 @@ namespace
                     colocated_info.colocated_mapping[cmv];
                 const auto& corner =
                     section_.corner( corner_ids[mapped_corner] );
-                const auto& line = section_.line(
-                    potential_corner_cmv_[cmv].component_id.id() );
+                const auto& line =
+                    section_.line( potential_corner_cmv_[cmv].component_id.id );
                 if( !boundary_relation_exist( corner, line ) )
                 {
                     builder_.add_corner_line_boundary_relationship(