Avoid usage of deprecated surface module

[heuer]

Although the surface module is deprecated, it is used a lot internally.

Solution: Don't import deprecated module, use compositor