Use x.org xid instead of wnck window in some places