Change 'id' to be 'system:id' to prevent clashes and be consistent. Fixes #1691