diff --git a/server/webdav/internal/xml/marshal.go b/server/webdav/internal/xml/marshal.go
index 4dd0f417..a0ec9cba 100644
--- a/server/webdav/internal/xml/marshal.go
+++ b/server/webdav/internal/xml/marshal.go
@@ -546,9 +546,9 @@ func (p *printer) setAttrPrefix(prefix, url string) {
 }
 
 var (
-	marshalerType     = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	marshalerAttrType = reflect.TypeOf((*MarshalerAttr)(nil)).Elem()
-	textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem()
+	marshalerType     = reflect.TypeFor[Marshaler]()
+	marshalerAttrType = reflect.TypeFor[MarshalerAttr]()
+	textMarshalerType = reflect.TypeFor[encoding.TextMarshaler]()
 )
 
 // marshalValue writes one or more XML elements representing val.
diff --git a/server/webdav/internal/xml/typeinfo.go b/server/webdav/internal/xml/typeinfo.go
index fdde288b..e55418cb 100644
--- a/server/webdav/internal/xml/typeinfo.go
+++ b/server/webdav/internal/xml/typeinfo.go
@@ -44,7 +44,7 @@ const (
 var tinfoMap = make(map[reflect.Type]*typeInfo)
 var tinfoLock sync.RWMutex
 
-var nameType = reflect.TypeOf(Name{})
+var nameType = reflect.TypeFor[Name]()
 
 // getTypeInfo returns the typeInfo structure with details necessary
 // for marshalling and unmarshalling typ.