With the RTM of Server 2016 and beginning testing in my environment; we needed to update our SCCM device collections.

Quick and Dirty, for Server 2016, WQL Statement:

select 
SMS_R_SYSTEM.ResourceID,
SMS_R_SYSTEM.ResourceType,
SMS_R_SYSTEM.Name,
SMS_R_SYSTEM.SMSUniqueIdentifier,
SMS_R_SYSTEM.ResourceDomainORWorkgroup,
SMS_R_SYSTEM.Client from SMS_R_System   
where    
SMS_R_System.OperatingSystemNameandVersion like "%Server%"   
and 
SMS_R_System.OperatingSystemNameandVersion like "%10.0%"

Whereas the Windows 10 Workstation variant is:

select 
SMS_R_SYSTEM.ResourceID,
SMS_R_SYSTEM.ResourceType,
SMS_R_SYSTEM.Name,
SMS_R_SYSTEM.SMSUniqueIdentifier,
SMS_R_SYSTEM.ResourceDomainORWorkgroup,
SMS_R_SYSTEM.Client from SMS_R_System   
where    
SMS_R_System.OperatingSystemNameandVersion like "%Workstation%"   
and 
SMS_R_System.OperatingSystemNameandVersion like "%10.0%"

  Simple; but maybe someone can  save a few minutes of drafting up t’he WQL.